Snap for 11399874 from 0360dff9adad4a871028d3739d4efbaf2eb76f28 to 24D1-release Change-Id: Icdbf91ce547f8c1c0311626f9579a1d719d2a442